[automerger skipped] Merge "Backporting the change of ag/15629060 to qt-dev" into qt-dev am: 587162dfb8 am: 37d7f20996 am: 646b7c72ef am: b5edea8384 -s ours am: 34b0222470 -s ours am: 0602776947 -s ours am: 40ecc85441 -s ours
am skip reason: skipped by user evanxinchen Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15744060 Change-Id: I036d14f6d2d96995e178ff1ed571d6ea81881fb0
This commit is contained in: