[automerger skipped] DO NOT MERGE am: 7f8c5e63 am: 714af85b -s ours am: 3364c78a -s ours am: caae31af -s ours

am skip reason: subject contains skip directive

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

Change-Id: I2e4f938f1492caa8652a316731def768d1e203c3