[DO NOT MERGE] Compatibilize flicker from master to sc-v2-dev am: 2af16463ee

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

Change-Id: Iee34900d90a225abe64920b356a211e3a9de26c0