[automerger skipped] Merge "Repackage APK to resolve...

[automerger skipped] Merge "Repackage APK to resolve testCheckSignaturesRotatedAgainstOriginal" into tm-qpr-dev am: 406443fa am: 4fd49624 -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/+/23711522



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