[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: 9fb5c6a5 am: b1744fad am: bc1d0387 -s ours
am skip reason: Change-Id Ie8ce66da527a7b696c1cdffe7b2225539352408f with SHA-1 3c182dd9 is in history
Change-Id: I9f469ae75a96079015bb4a6aae5192c75be78408