Merge "Repackage APK to resolve testCheckSignaturesRotatedAgainstRotated" into...

Merge "Repackage APK to resolve testCheckSignaturesRotatedAgainstRotated" into tm-dev am: bc40f751 am: 35901234 am: 39c0fe37 am: 69f4a2b4 am: 278915d4

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23924771



Change-Id: Idb26de40b526ce3410f9426b82ca73b549d0de5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>