Also remove useless custom preference Fix: 36395109 Test: robotests Change-Id: I07297e6ade6991a8262473c9f59c21d914300244
Bug: 19003093 Change-Id: I15baa5b1d19324521070d641ae6a227d782a4e9e