Merge "Fix a few issues in WindowDecor" into tm-qpr-dev am: 639a4a914a am: 262a86fd6f

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

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