Merge "EventLog for UserController broadcasts (formatting)" into rvc-dev am: 3685058e52 am: b44a7dd1a9

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

Change-Id: I034200177afb812c7943176f6271c380cd8a6974