Merge "Merge "Controls UI - Wait for callback to potentially show controls" into rvc-dev am: 0d425c2e am: ede57198" into rvc-d1-dev-plus-aosp am: 0487187b am: 091e8e02

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

Change-Id: I5030478be9e5e9bf31f608686a9a945e67fedb77