Modify test cases according to change in remove preference behavior.

Bug: 35365702
Test: make RunSettingsRoboTests
Change-Id: I541f4bd946116c766a90da955c11933a5499fa93
14 files changed