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

[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

am skip reason: skipped by user evanxinchen

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

Change-Id: Ib82e3c4ef50f3ce81ddce3f9df42d05a7b1393bb