Merge "remove unused code in PrivacySettings" am: abd78cc6b3
am: 0da27eb08c

Change-Id: I3e82479c29fe00c195b80e80497aaa2b402146cd