Merge "Fix missing operation when hiding window for rotation" into tm-dev am: 25b45cfd am: 30ee16fe

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

Change-Id: Ic89db7efeb3881cf799c5b33965af8a02a9591c3