Merge "Fix an issue where OEM pref tests don't clean up correctly" am: bbb7ae75d1

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

Change-Id: Iffea72f050311cdfc3b3f12211fe95d632851d6e