[automerger skipped] Merge "SettingsRoboTests: Remove direct dep on sdk_vcurrent module." am: ea74edc9c5 am: cb64305ad3  -s ours
am: 9664c8f296  -s ours

Change-Id: I502be07897421f697590959deba09fe970859b6a