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

am skip reason: subject contains skip directive

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

Change-Id: I4333820eab06a24a12a857c84445936817b2ce49