Merge "[Output Switcher] Add new fields in metrics event" into udc-qpr-dev am: 558f38ac48 am: 1b00ddad3c

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

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