Merge "Controls UI - Update bg color for Stateless templates" into rvc-dev am: 721a3ac8 am: 96659e44 am: b12833ca am: a76e4e87

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

Change-Id: I0046c97bc500e39ba39e3403069c100861a63dd3