Merge "Repackage APK to resolve testCheckSignaturesRotatedAgainstRotated" into tm-dev am: bc40f7517d

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

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