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

Merge "Controls UI - Fix icon, title, subtitle for error states" into rvc-dev am: 0cf37c40 am: a4827ac2 am: 96da8397 am: 4e11f728

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

Change-Id: Ib787581a628e9582f1ab70f632ade642943dc16a