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

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

Change-Id: Idf1bc4cd1c317e230413eb48785ae78579460cb3