[automerger skipped] Merge "[DO NOT MERGE] Compatibilize flicker from master to sc-v2-dev" into sc-v2-dev am: 2a5d5da9 am: 65595e47 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I84859fce0c6504dcfb6c20c54bc3009afe2e1692