Merge "Draw background color above display area..." into udc-dev am: c7e6a782 am: 4126b25c

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



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