[automerger skipped] Merge changes from topic "presubmit-am-0635c718d1dd418e8eb0c803ec3b93fe" into sc-v2-dev-plus-aosp am: 7badfb1f -s ours

am skip reason: Merged-In Iebbe1c8749ef43ac310179698a048a93be47e24b with SHA-1 cb5d61b4 is already in history

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

Change-Id: I06499559480e22ac4fd00fc5e533b9df53922797