Merge "Controls UI - Blank activity when launched on lock screen" into rvc-dev am: 18b5f5fa am: 99d5a033

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

Change-Id: Idd91b7f6423c776addcfbde41716ec1e780ecb93