[automerger skipped] Merge changes from topic "presubmit-am-cbc644a75a634fa49a2e0c5860314968" into sc-v2-dev-plus-aosp am: 6b5cdaf9f8 -s ours

am skip reason: Merged-In I63501bf573e006f52379192b7b766283fea40dda with SHA-1 119975a765 is already in history

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

Change-Id: Ie764ca096b9ab69c55b3319494ecbd184d4d4a50