Merge "Rewrite testBadApkOnly (1/n)" into rvc-dev am: 0cb85d1a am: 3ff5f8a6 am: 07e2dd99 am: b74c5b1a Change-Id: I11409e28061d1447bbfbde31cfd5fa5099b793ae