[automerger skipped] Merge "DO NOT MERGE" into sc-dev am: 6dac41f6 am: e656860e -s ours am: c5230e0d -s ours

am skip reason: subject contains skip directive

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

Change-Id: I1a4b7773d51751e4eeef660502940ff948b005c8