Merge "[Output Switcher] [Group by Type] Add MediaItem to store data" into tm-qpr-dev am: f537e31939 am: 36bb7c3161

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

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