Merge "Fix flicker when swiching resolution change" into tm-qpr-dev am: 0fda3256

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



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