Merge "When updating background colors in the shade, be sure to apply the...

Merge "When updating background colors in the shade, be sure to apply the reset to child rows." into tm-qpr-dev am: ae85446b am: 8928d21d

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



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