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

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



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