[automerger skipped] Merge changes from topic "12940341" into oc-dev am:...

[automerger skipped] Merge changes from topic "12940341" into oc-dev am: a9a03ae6 am: b172aaf7 am: 37beb317 -s ours am: 5ea00f8c -s ours am: b77727b9 -s ours am: f2bc09c7 -s ours am: 5a72f60c -s ours am: 28c0f6e0 -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/+/12987876

Change-Id: Id986f1f155af57eb1d78038d3c3e4469cfa29ed9