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

Change-Id: Iaff60e1fa06b9c73de21a5693383ea17b4a06e91