[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-242e7057c303476d9bf9b440aeb2b9a6" into sc-v2-dev-plus-aosp am: c9a8674e -s ours

am skip reason: Merged-In I4a29c47f218046d0852178ad5dc7484a86ef8607 with SHA-1 46fff422 is already in history

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

Change-Id: I7aa9a4fcaa5a03828716881fd7d87c0848682ed4