Merge "remove unused code in PrivacySettings"
am: abd78cc6b3

Change-Id: I8772066bf9bf759628f1937ca1949086a8ff8509