[automerger skipped] Merge "DO NOT MERGE" into sc-dev am: 6dac41f6 am:...

[automerger skipped] Merge "DO NOT MERGE" into sc-dev am: 6dac41f6 am: 1c3fa305 -s ours am: 2474b2a3 -s ours am: 3b47535d -s ours am: 74807869 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I2b1d67614a02eaf3ace072f0d494e8c809499ec6