Merge "Merge "Controls UI - Handle activity dismissal from dialog" into rvc-dev am: 84bc21cb am: 3d21ab95" into rvc-d1-dev-plus-aosp am: 346df640

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

Change-Id: I3a9b36ad40475f96d61ad3855a287f7164d87bfd