Merge "Fix regression when launching the media output dialog" into sc-v2-dev...

Merge "Fix regression when launching the media output dialog" into sc-v2-dev am: 64c7c715 am: eb85b9ef

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

Change-Id: I2404fe9f2392f6b0f7e0d829b58a8592efc0a628