[automerger skipped] Repackage APK to resolve...

[automerger skipped] Repackage APK to resolve testCheckSignaturesRotatedAgainstOriginal am: f4cbf1dd -s ours am: 7366bed3 -s ours

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

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



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