am c1c44a56: Merge change 6363 into donut

Merge commit 'c1c44a5614c4ab7aaf5315f92dc1c8f6420c8f1c'

* commit 'c1c44a5614c4ab7aaf5315f92dc1c8f6420c8f1c':
  LocationManagerService: Use Context.checkCallingOrSelfPermission for permission checks