[automerger skipped] Merge changes from topic...

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

am skip reason: Merged-In I94ba39c775cf95074907db6814104289a577d496 with SHA-1 fc3ec92a is already in history

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

Change-Id: If3df50f6918f79637d7a8cd2d17d99c3678096f7