[automerger skipped] DO NOT MERGE am: 7f8c5e6371 am: 31e57724b1 -s ours am: fd96788fe0 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I8d7ea5d13df6463d63c38c06880d7dc46759ada5