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

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



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