Merge "break up LocationManagerService's WakeLock" into jb-mr2-dev