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

Change-Id: I6fa29465e6d2ab5f580712ced9c789df27e21a78