[automerger skipped] Repackage app2 to resolve...

[automerger skipped] Repackage app2 to resolve testCheckSignaturesRotatedAgainstOriginal am: fbbf811c am: dca98803 am: 3185031f -s ours am: 18e95cc5 -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: Ief3193e34712a573024fefb43e999fbf9ced3da7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>