Merge changes from topic "screen_decor" into tm-d1-dev am: b4ca2011 am: de170f1f am: 30539777

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



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