am 584c5997: (-s ours) am b678f3bb: (-s ours) Add support for GPS privacy lock.  DO NOT MERGE
Add support for GPS privacy lock.

Change-Id: I06dbd4b332926dde836eedb95e15791a7ebe0294
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '30219ff6bee36db7e30256de7bd74ca5a4498549' into oxygen_4.3

* commit '30219ff6bee36db7e30256de7bd74ca5a4498549':
  Add support for GPS privacy lock.