Merge "Revert "Fix flicker when swiching resolution change"" into tm-qpr-dev am: fa1f2789

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



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