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

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

Change-Id: I0c293be57c7870a4ec72908b1498b9f7805232cf