Merge changes from topic "am-3aaf8bb5fe054546b4807f8442dd0d01" into tm-dev

* changes:
  Merge changes from topic "cp-sc-dev-222473855" into sc-qpr1-dev am: a6aa828949 am: bb6a4b6fb2
  [automerger skipped] [automerge] DO NOT MERGE. Add a permissions check to LocationManagerService. 2p: 5b376bc9fd am: 32bf2b1707 -s ours am: 31190222bc -s ours