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

Change-Id: I3629843911d1040f7cab8250050e03c0665a8e5c