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

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

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