[automerger skipped] Merge changes from topic "presubmit-am-1243466f3d904d3d812e413e70d976ef" into sc-v2-dev-plus-aosp am: 81102a32c1 -s ours
am skip reason: Merged-In I3be6b3f05c9542404379a07f4fc734e45a75152a with SHA-1 63300ce049 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17238104
Change-Id: I1462e0c664fa380dacfdd61487432d49ef8d2df8
This commit is contained in: