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

Merge "Repackage APK to resolve testCheckSignaturesRotatedAgainstRotated" into tm-dev am: bc40f751 am: 55e4a3ed am: 92d01d85 am: 062810b2

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



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