Merge "[automerger skipped] Merge "Backporting the change of ag/15629060 to qt-dev" into qt-dev am: 587162dfb8 am: 37d7f20996 am: 646b7c72ef am: 8bff0b573f -s ours am: 401b2e2fe0 -s ours am: 730d1b6088 -s ours am: 60434f912f -s ours" into sc-v2-dev-plus-aosp am: 2dc696c165 -s ours

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

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

Change-Id: I67f643235eccbdb0255be9d6e9eb3b65b7ff4ba9