DO NOT MERGE: Downbranch merge conflict [Output Switcher] Log new events am:...

DO NOT MERGE: Downbranch merge conflict [Output Switcher] Log new events am: d7be851e am: 516cf44f

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



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