[automerger skipped] [DO NOT MERGE] Compatibilize flicker from master to sc-v2-dev am: 2af16463 am: ce20a423 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ia043842625f7e71670efd82547607b7d3c74e9eb