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

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

Change-Id: I38c73e805a520d0a30b91521cd082f3f9dc971ba