[automerger skipped] DO NOT MERGE am: 7f8c5e63 am: 31e57724 -s ours am: fd96788f -s ours am: b7029a8d -s ours am: a0397449 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I883003e15947364aed48688b257b5c7bb47f0b97