[automerger skipped] Merge changes from topic "12933388" into qt-dev am:...

[automerger skipped] Merge changes from topic "12933388" into qt-dev am: ebf67ea3 am: da1ea4bc -s ours am: d39d8ce0 -s ours am: ec522fff -s ours

am skip reason: Change-Id If3b420067b4d7111dcf67ae6f98e42176158b679 with SHA-1 33e24c88 is in history

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

Change-Id: I2a8839438267eb0b1fea679b529f9568991a94d0