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

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

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



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