Merge "Merge "Controls UI - Wait for callback to potentially show controls" into rvc-dev am: 0d425c2e am: 261faac8" into rvc-d1-dev-plus-aosp am: c763b3d2

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

Change-Id: I27b63d709d07432372424a5f826fe22ecba9140f