Merge changes from topic "screen_decor" into tm-d1-dev am: b4ca20115d am: de170f1f5e

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

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