[automerger skipped] Merge "DO NOT MERGE" into sc-dev am: 6dac41f6 am: 1c3fa305 -s ours am: 2474b2a3 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Icd3879d2b3d410554015654e1cf0d5f04ef697d2