Merge "Merge "am/UserController: Log system uptime at two \'boot complete\' markers." into nyc-dev am: eb47d6205f am: 440e3c7dfe" into nyc-mr1-dev-plus-aosp
am: 80267f2b08

* commit '80267f2b08f6814ab23d1436a2a37a1b032374e0':
  am/UserController: Log system uptime at two 'boot complete' markers.

Change-Id: I6fc9be4e3a02a8f32032d20134ca92a50e20a8f2