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

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



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