[automerger skipped] Merge changes from topic "12933478" into pi-dev am:...

[automerger skipped] Merge changes from topic "12933478" into pi-dev am: a15664c0 -s ours am: df71b0f3 -s ours am: 8b8dba96 -s ours am: 4f68954d -s ours am: 9f415e9b -s ours

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

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

Change-Id: Id3c1ebfa515f1fdbcf486c155bf3a9a777ed44c2