Merge changes from topic "screen_decor" into tm-d1-dev am: b4ca2011 am: 6a6b2bb5 am: de423af7

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



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