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

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

Change-Id: Ibc60cfc298c10a476b726376346a67e389e0e5b2