Merge "Rewrite testBadApkOnly (1/n)" into rvc-dev am: 0cb85d1a am: c91ef2c2 am: ed8aff2f am: cab16691 Change-Id: I03a19f1683d7a07bcb36cd5036dde2bb90f07795