Update logic of updateNonIndexableKeys, in BaseNfcPreferenceController to fix issue. Add robotest to avoid same problem. Change-Id: I1de5324b5a7147ff58e3c366ee7e8cf858e3283c Fixes: 78540155 Test: make RunSettingsRoboTests
Update logic of updateNonIndexableKeys, in BaseNfcPreferenceController to fix issue. Add robotest to avoid same problem. Change-Id: I1de5324b5a7147ff58e3c366ee7e8cf858e3283c Fixes: 78540155 Test: make RunSettingsRoboTests