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

[automerger skipped] [DO NOT MERGE] Sync flicker from master to sc-v2 am: c8287a93 am: a61012f1 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ic38240d75e65537bdf857d28d2e84bba581143b8