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: Ib659ddd689a1f5a244f4edd53983fadfeb44c029
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>