Merge "[automerger skipped] Merge changes from topic "system-server-images"...

Merge "[automerger skipped] Merge changes from topic "system-server-images" into sc-dev am: 8e8cb4cb -s ours am: 8e6d0fe6 -s ours" into sc-v2-dev-plus-aosp am: 09c8c36d -s ours

am skip reason: Merged-In I02980e58bfd9bb334f1aa50c9e51a8ce4ae5e059 with SHA-1 07e04b69 is already in history

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

Change-Id: Id623b7d68ac18f65bc31950952752edacbd2f90a