[automerger skipped] Merge "DO NOT MERGE" into sc-dev am: 6dac41f676 am: 1c3fa305ac -s ours

am skip reason: subject contains skip directive

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

Change-Id: I68e6fb275a26623ea6b71535f5b82a8dbc0bf738