Merge "Controls UI - Update bg color for Stateless templates" into rvc-dev am: 721a3ac836

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

Change-Id: I6c5dda4acd85edcf5ff86e5b7370513581483b7b