Merge "DO NOT MERGE. Add a permissions check to LocationManagerService." into tm-dev