[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-168cf479d94e4c1799d700b653699425" into sc-v2-dev-plus-aosp am: 147c75fa -s ours

am skip reason: Merged-In I2eba0a592fa33ed25e1ac3919f1b2631e5db4258 with SHA-1 17033a61 is already in history

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

Change-Id: Id66a81988c8ff8e1b793f715597dccebfdb0883c