Merge changes from topic "12933388" into qt-dev am: ebf67ea3b2

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

Change-Id: I1893ed21bd88dbb1a29133c829fcb63f1485a326