[automerger skipped] Repackage app2 to resolve...

[automerger skipped] Repackage app2 to resolve testCheckSignaturesRotatedAgainstOriginal am: fbbf811c am: 846ff845 am: 2e6cf9d9 am: 21c66eca -s ours

am skip reason: Merged-In I6917d89d515a77e6bdeb0d09a7b6656460809c2b with SHA-1 30d10b86 is already in history

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



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