Also remove useless custom preference Fix: 36395109 Test: robotests Change-Id: I07297e6ade6991a8262473c9f59c21d914300244
Change-Id: I28eeb3e5c3ed290d4e03e0f3989adde0b966bede Fix: 35851000 Test: make RunSettingsRoboTests