Merge "[DO NOT MERGE] Do not log boot times for secondary users and upgrades" into nyc-mr2-dev
am: fcb06b3735

Change-Id: I322bc1977cce2292db5b86d66eaa91519d758950