Merge "Fix bugs in LocationManagerService and AppOpsPolicy" into sc-dev