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

[automerger skipped] Merge changes from topic "system-server-images" into sc-dev am: 8e8cb4cb am: f4c16485 -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: Ie02b69d9f87b083290d45d6141e65f17d162b44a