Merge changes from topic "am-c4b7e98f4fc245ecb0cf89b442518c86" into tm-qpr-dev-plus-aosp

* changes:
  Merge changes from topic "cp-sc-dev-222473855" into sc-mainline-prod am: a42bd431 am: ff2773b0 am: 0fe59ac7 am: ef1f758f
  [automerger skipped] [automerge] DO NOT MERGE. Add a permissions check to LocationManagerService. 2p: 5b376bc9 am: df70a824 -s ours am: 380a1c8b -s ours am: 44f4936c -s ours am: e1f8d126 -s ours