[automerger skipped] Merge changes from topic...

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

am skip reason: Merged-In I07739b5763f78580475476aa81d5d1297f956fde with SHA-1 81f834d4 is already in history

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

Change-Id: I49b3883c8081e4fb9084e4e40faee7c20a7aad0f