Merge "[automerger skipped] Merge "Backporting the change of ag/15629060 to...

Merge "[automerger skipped] Merge "Backporting the change of ag/15629060 to qt-dev" into qt-dev am: 587162df am: 37d7f209 am: 646b7c72 am: b5edea83 -s ours am: 34b02224 -s ours am: 5f700448 -s ours am: 5c572098 -s ours" into sc-v2-dev-plus-aosp am: 8f3a1cd1 -s ours

am skip reason: Merged-In I7e2f95fd85e18127dc481f188ace8ad6effc4831 with SHA-1 8f005ffe is already in history

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

Change-Id: If46d06d40be680b0af3e230f4ea9e9db61d93e14