am d9f7250a: Merge "break up LocationManagerService\'s WakeLock" into jb-mr2-dev

* commit 'd9f7250a1d53cf1be66fd20b95f1303abb1d2a10':
  break up LocationManagerService's WakeLock