Add exit logs to various points

* This solution still isn't comprehensive. We're
missing exits from things like screen off,
swiping up from overview, etc. However, we probably need
to do a much larger overhaul of how we're logging metrics and be
better about defining what "enter" and "exit" mean
* Couple minor bug-fixes

Bug: 349930269
Test: Tested via logging
Flag: EXEMPT bugfix
Change-Id: I096e0a6bf11edf4bcf1b9fd0964285ecd812996c