Merge "Reland - Fix flicker when swiching resolution change" into tm-qpr-dev am: 5d83ecce

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



Change-Id: Ic2204c99b062b46bdf79f64935c9dd528cea53e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>