[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-c4d8ef327dd44e5daddb1982f2951a6b" into sc-v2-dev-plus-aosp am: cea9746e -s ours am: b6b89a1d -s ours

am skip reason: Merged-In Ifc93d5482bad9591e942e4be91e0039daae743b1 with SHA-1 5bf81c05 is already in history

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

Change-Id: Ifb2050f9595312c298f545f103de36a1d54c1c12