[automerger skipped] Merge "Using EventLog for user switching events" into...
[automerger skipped] Merge "Using EventLog for user switching events" into rvc-dev am: 5c36c955 am: 81f058e1 -s ours
am skip reason: Change-Id Ie8ce66da527a7b696c1cdffe7b2225539352408f with SHA-1 afd92de7 is in history
Change-Id: I3e6c9b46b15dd122fcfa12f8ca406e482e8f43ca