[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-31699ed9e624441eb6ee823419ae5300" into sc-v2-dev-plus-aosp am: 067cc693 -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: I8e8da4cccfc6a8a20a3b00262bf899ee73fd18c9