Merge "Remove double-locking from PowerManagerService.onBootPhase" into tm-dev