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: 1d4d4431 am: 31fab40a

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



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