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

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

Change-Id: I115e67b256c4c268e6b0f931f838d24373441741