Merge commit '8acdb911' into froyo-plus-aosp * commit '8acdb911': Add support for GPS privacy lock. DO NOT MERGE