Merge changes from topic "cp-sc-dev-222473855" into sc-qpr1-dev
* changes:
[automerge] DO NOT MERGE. Add a permissions check to LocationManagerService. 2p: 5b376bc9fd
DO NOT MERGE. Add a permissions check to LocationManagerService.
This commit is contained in: