[automerger skipped] Merge "[DO NOT MERGE] Sync flicker from master to sc-v2"...

[automerger skipped] Merge "[DO NOT MERGE] Sync flicker from master to sc-v2" into sc-v2-dev am: 6bd19fab am: eb1a6500 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I04b8a06c6bf2f9a6ce31f43e493d45b2bf3d1a22