Merge "Controls UI - Update bg color for Stateless templates" into rvc-dev am: 721a3ac8 am: 63d2c768 am: 7049d436 am: 34f9e0b8

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

Change-Id: I51502acbb0a4f0472027b04dbaa0a7c65cc4fa9c