[automerger skipped] Merge changes from topic "presubmit-am-6bd2dc4c86ff420f9becf1b089e962a7" into sc-v2-dev-plus-aosp am: 49ededb26d -s ours am: 73665f7eb6 -s ours
am skip reason: Merged-In I00655c2e85c46bd0c52b77094757e155b1a6f9c9 with SHA-1 22ae995c20 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17005881
Change-Id: I50b5736b89d01bc42f3236d34fd70bf92e01ce19
This commit is contained in: