[automerger skipped] Merge "Repackage APK to resolve testCheckSignaturesRotatedAgainstOriginal" into tm-qpr-dev am: 406443fac5 -s ours

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

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

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