Merge "Revert "More work to hook up screen event logging"" into ub-contactsdialer-a-dev am: f58d982e72
am: 2084754321

* commit '2084754321404919da7fad2d63b1112e2b03768b':
  Revert "More work to hook up screen event logging"