Added test to verify fix. Bug: 128354921 Test: m RunSettingsRoboTests Change-Id: I24cbb966e549eec783912e4e118c00425b971ad0