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

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



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