Merge "Tapping dream media chip opens media instead of UMO if flag is set."...

Merge "Tapping dream media chip opens media instead of UMO if flag is set." into tm-qpr-dev am: b18a6841

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



Change-Id: I665f6a4089ab9c376fdd96ebba087892654b4c6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>