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