Merge "Merge "Controls UI - Handle activity dismissal from dialog" into...

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

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

Change-Id: I97ca803368ec4ee5baf686ca4e7e14a33014826e