[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
am skip reason: skipped by user evanxinchen Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15744060 Change-Id: Icf695895c91ffab16fafea64852a514edc444758
This commit is contained in: