[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-08bbcb587d4e47b6afcc900c23899344" into sc-v2-dev-plus-aosp am: 221b5126 -s ours am: 039ae4f6 -s ours

am skip reason: Merged-In If436aae1b4ebdb06c7bd5a1c0b8d6df4e94488cd with SHA-1 e13c17d2 is already in history

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

Change-Id: I9d0b05e2a10770441796059766c0231214444ec3