[automerger skipped] Repackage APK to resolve...

[automerger skipped] Repackage APK to resolve testCheckSignaturesRotatedAgainstOriginal am: 0ebf094b am: e517d9ba -s ours am: 2dfac30c -s ours am: 7b715ed9 -s ours am: 223b990a -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: Id41434a223dbb8f35ab0952ab4d809859c7f66f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>