[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-cc33c9de596c45a48f23d05bd8cbad1a" into sc-v2-dev-plus-aosp am: 8d774bfd -s ours

am skip reason: Merged-In I29c39bf1e3d7dc69cc1f83854a23f6b33a6eac58 with SHA-1 b9290319 is already in history

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

Change-Id: I8f377ad3fae12823d5a4513d9cd22c3c47b189a5