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

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

Change-Id: I0d4075cbc467753dba116847bbf2230c56d5862b