Merge "Controls UI - Handle activity dismissal from dialog" into rvc-dev am: 84bc21cb am: 6e7b3c21 am: 25970e27 am: fbf57020

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

Change-Id: Icf13f837abd9645eafec8b5b37d8002ab07bd56e