Merge "[automerger skipped] Merge changes from topic "b196691596" into sc-dev...

Merge "[automerger skipped] Merge changes from topic "b196691596" into sc-dev am: 7b3e40dd -s ours am: de460d15 -s ours" into sc-qpr1-dev-plus-aosp am: 27ffbed7 -s ours am: 2c568728 -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: I3435c40041a93c6b582ab16d2285f1028284d970