[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-5482901e1a9f43f99964b507e3ad4959" into sc-v2-dev-plus-aosp am: 3424369d -s ours am: bb8c65ed -s ours

am skip reason: Merged-In I9881453ba14cba4f219861ec4449f2baa8058b57 with SHA-1 da737e71 is already in history

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

Change-Id: Ic15f15524a1fc0da60b8128160fbd55170d4a2e4