[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-2c63fa1e59454e9991156d52d9080e19" into sc-v2-dev-plus-aosp am: 84ddae57 -s ours am: 730f8638 -s ours

am skip reason: Merged-In I6237dd1c88f50733ab24e45806c413d5777032e9 with SHA-1 5c107b0b is already in history

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

Change-Id: I63956df7f5165d1c2bdc72987eafe241a7c3861a