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: Ic348051ee146ec6afa6aa024bad6752c8ce5b977
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>