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

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

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



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