[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-9ba2a394f5ad4d338eadbfa2cb56aee6-sc-dev-sc-v2-dev-sc-v2-dev" into sc-v2-dev-plus-aosp am: e09ddd44 -s ours am: 28cc4e57 -s ours

am skip reason: Merged-In I06c5eaf4a82368996c734cd245803b3d7c4e7d71 with SHA-1 154a7635 is already in history

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

Change-Id: Ic23684be13594584604af5081d388e859a930d0f