[automerger skipped] Repackage app2 to resolve...

[automerger skipped] Repackage app2 to resolve testCheckSignaturesRotatedAgainstOriginal am: fbbf811c am: dca98803 am: 3185031f am: cce70b50 -s ours am: 43466937 -s ours am: f1b5f259 -s ours

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

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



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