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

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

Change-Id: I487eaa279cc0054675c722d1c91b82598b4dd45d