Merge "Refactor Service code out of main ActivityManagerService class." into jb-mr1-dev