Merge "SettingsRoboTests: Remove direct dep on sdk_vcurrent module."
am: ea74edc9c5

Change-Id: I79d97720c6b4e5f773644d686b06acc9f3e8840d