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