[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: 014fe5e1 -s ours am: 37e1b5a0 -s ours

am skip reason: Change-Id If3b420067b4d7111dcf67ae6f98e42176158b679 with SHA-1 60c41ae4 is in history

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

Change-Id: I821e4c0731d13a5fb92859e1198d741ff0db09b8