Merge "Merge "Controls UI - Fix icon, title, subtitle for error states" into...

Merge "Merge "Controls UI - Fix icon, title, subtitle for error states" into rvc-dev am: 0cf37c40 am: a4827ac2 am: c58a09cd" into rvc-qpr-dev-plus-aosp am: 3e799d4d

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

Change-Id: Icadec2b85a5bd998dec42c1e7601bf185c215679