[automerger skipped] Merge changes from topic "presubmit-am-4b93111e023146348958d97ed22a1550" into sc-v2-dev-plus-aosp am: 7aa9ae3d6d -s ours
am skip reason: Merged-In Iad8b9d9a0d75bdaaa2a7255a33208c2c0c3fc25b with SHA-1 7fa945fcc9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16692450
Change-Id: I2b0257186e9afb97efda086514be81c28f1b381f
This commit is contained in: