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

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



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