Merge "Repackage APK to resolve testCheckSignaturesRotatedAgainstRotated" into tm-dev am: bc40f7517d am: 35901234d8 am: 39c0fe371d

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

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