Merge "Merge "Controls UI - Handle 'not found' better" into rvc-dev am:...

Merge "Merge "Controls UI - Handle 'not found' better" into rvc-dev am: 8761fbb5 am: 3c731d49 am: e25ed259" into rvc-qpr-dev-plus-aosp am: 3c512055

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

Change-Id: Ifd3cb7d5a194883a0c4d02695f6b5d254443c577