Merge "Merge "Update taskbar background color." into tm-qpr-dev am: 44665068" into tm-qpr-dev-plus-aosp am: 4dada52e am: db73e54b am: 29f2d332

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



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