Merge "Fixed screendecorations flickering while resolution change" into tm-d1-dev am: e7b5fa88

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



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