[automerger skipped] Merge "Key rotation support when updating an app on...

[automerger skipped] Merge "Key rotation support when updating an app on IncFS." into sc-dev am: befe7710 am: a7b5229c -s ours am: 8044ff4d -s ours

am skip reason: Merged-In I6ff854786aea31c6e9f3f1e33be0a33b4ba67ccb with SHA-1 7a1de6fe is already in history

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

Change-Id: Ic79db55a22a7e61848af7d7215ba57f5c24c04ba