[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: Ic32ddc1ae935a86b81d2eb3667d973b0c944f1fb