Merge "Backporting the change of ag/15629060 to qt-dev" into qt-dev am: 587162df

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

Change-Id: I3b0f3bdeff33c52b5b20f4b6db10f5069d9bfbb6