Merge change 6363 into donut

* changes:
  LocationManagerService: Use Context.checkCallingOrSelfPermission for permission checks