Merge "Put window decors at one place" into tm-qpr-dev am: 16b78301

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



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