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

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



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