Merge "Backporting the change of ag/15629060 to qt-dev" into qt-dev am: 587162dfb8 am: 37d7f20996 am: 646b7c72ef

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

Change-Id: Ie3e03b1dae76440b8ad1e16862239b23ce091fdc