Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Log new events" into tm-dev am: 8ade0d82 am: 1c332450

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



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