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

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

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



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