Merge "Cleanup testOverrideVendorId static member after running unittest." am: c240b24706 am: 933f466f0b

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1553836

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I79e46f598d4f418deaf0761d06571e16590ead89