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