Settings.java clean up

Remove duplicates from ParanoidXperia merge

Change-Id: I5ee616fbda56b67183c82e6f710cd155f1bfc78a