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: Ifed130bc06f0d79f1039f31574b9d2a857564c8e