Merge "Fix component in ControlsRequestDialog" into rvc-dev am: 12927d9214 am: 4c139797af

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

Change-Id: I5d7ea6ffadf804cd98a3cc75b6aa5394b59b919f