Merge "Controls UI - Show timeout msg and not controls on error" into rvc-dev am: cde9d6b37f am: 8de9d2b451
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11941804 Change-Id: I0ecbe4fa1a6fbcc3340977f2e901d2ecb929b650
This commit is contained in: