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

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

Change-Id: I0437a122e081c17008c287a3c30374e52a8c3c97