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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2b41d5cc9306e5e471b21c512c3cb73c4682f3ed