Merge "Add support for GPS privacy lock.  DO NOT MERGE" into froyo