[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: 8bff0b57 -s ours am: 401b2e2f -s ours am: c8752e11 -s ours am: 4ad5767d -s ours

am skip reason: skipped by user evanxinchen

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

Change-Id: I77ab880ac620ae90ee3929dc57c5839935472767