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

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

Change-Id: Ia25fd2962b3f880e0e78867bc4a8efddc5a32ec5