Merge "Rewrite testBadApkOnly (1/n)" into rvc-dev am: 0cb85d1a48 am: c91ef2c213

Change-Id: Ie9c7a4e69ded85ba64f19c48f336b18e3a7b1889