[automerger skipped] Merge changes from topic "presubmit-am-8c7a56762e85448ab5d8dd1b8eab00d7" into sc-v2-dev-plus-aosp am: fcf7870baf -s ours
am skip reason: Merged-In I793f76a23978cbbbbde2d16e8a522615174bcdd5 with SHA-1 11bd644822 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16835208
Change-Id: If00e3fa4db0d4950df016c98f62a91f9fc4c2981
This commit is contained in: