[automerger skipped] Merge "Migrate media output switcher metrics - 2/n" into rvc-qpr-dev am: 4dd011b3c7
-s ours am: 3107b30f49
-s ours
am skip reason: Change-Id I5abb471452ec92670d220b2472eadbe77e243653 with SHA-1 8da41d2eda
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13182886
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia2a2e7c2861cef58411a3e9eb4053f7c44af2fc3
This commit is contained in: