Merge "Controls UI - Handle activity dismissal from dialog" into rvc-dev am: 84bc21cbec am: 6e7b3c21c4 am: 21808ade61 am: 21722db6c7

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

Change-Id: Ieec858d743a116417ae3c7c54153d37e5ae87127