Merge "Revert "Fix flicker when swiching resolution change"" into tm-qpr-dev...

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

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



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