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

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

Change-Id: Ieb7c19d63bdab84568c494926ecbc7c6dbbd6bee