Merge "Fix decor stuck after rotate" into udc-dev am: 8b77e6b0 am: b05472cc am: 1d4d4431

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



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