Merge "Merge "Controls UI - Handle 'not found' better" into rvc-dev am: 8761fbb5 am: 745f8cdf" into rvc-d1-dev-plus-aosp am: 6be3ce23 am: 36b1ea17

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

Change-Id: I780aec2c83f6c7b135684a337ce166b43685a590