am b00518d8: Merge change 4796 into donut

Merge commit 'b00518d81550c638728b53346a2a25f0a80a1049'

* commit 'b00518d81550c638728b53346a2a25f0a80a1049':
  Move USE_LOCATION_FOR_SERVICES to Secure.