[automerger skipped] Repackage APK to resolve...

[automerger skipped] Repackage APK to resolve testCheckSignaturesRotatedAgainstOriginal am: 0ebf094b am: be62e635 -s ours am: 2d2210d9 -s ours am: 6e8dc7bb -s ours am: 5987beb1 -s ours

am skip reason: Merged-In Iaf0e974190273b13468da5e61eb8c8df73607ffc with SHA-1 f4cbf1dd is already in history

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



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