Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Log new...

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

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



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