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

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

Change-Id: If2d4073fd580fce070c39082154ffe0c3e3ddfed