Merge "Controls UI - Handle 'not found' better" into rvc-dev am: 8761fbb501 am: 3c731d4928

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

Change-Id: I33877c644b0b7fd6a80b359cc62777ab242fbc52