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

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

am skip reason: subject contains skip directive

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

Change-Id: I2be4c8b3bceaf749b4d1ead1f95e5d11248a9827