[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-d7178652ff24438db859a4dbafaa0453" into sc-v2-dev-plus-aosp am: 96290817 am: 5b4ae9d8 am: 6e5add15 -s ours

am skip reason: Merged-In I644a5784fb42352ba28ac944d3aa3564b0215a78 with SHA-1 98f81227 is already in history

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

Change-Id: I43f94bffccadd1c00f7f2c62fb41f905e7f5b231