Merge "Fix SysUI crash when locking while showing the Media Output Group dialog" into sc-v2-dev am: d8b856ceae am: 9666baea4d

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

Change-Id: I1d6cbf6271a8f60251e9e1d4ff56d201acc6f152