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