[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-577a9b2017934ee98a8cce84a081bc38" into sc-v2-dev-plus-aosp am: 6877e6b7 -s ours

am skip reason: Merged-In I5ce4460043250aad4a5b0b0838e6f3b5ae6feb1d with SHA-1 670240dc is already in history

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

Change-Id: I74380dbc6a25fd5cd3970c53f680206e8e0fbc43