am 2595f146: Use the new Secure settings for location. Also added the code to invoke the consent dialog.

Merge commit '2595f146fecd3828231c6611362cce65acd9afb6'

* commit '2595f146fecd3828231c6611362cce65acd9afb6':
  Use the new Secure settings for location. Also added the code to invoke the consent dialog.