Merge "Fix decor stuck after rotate" into udc-dev am: 8b77e6b061 am: cca2a382ed

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

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