[automerger skipped] Repackage app2 to resolve...

[automerger skipped] Repackage app2 to resolve testCheckSignaturesRotatedAgainstOriginal am: fbbf811c am: 846ff845 am: 2e6cf9d9 am: cda637b4 am: 756883b3 -s ours am: d5275e1f -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: I28cb366e7cb3ee1ac481f113fb8666bd003186a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>