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

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

Change-Id: I1a3afe791828b73ca7896119a947f76a2aab370f