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

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

Change-Id: Idad5dd759a616c449d2f719dad682e2fabd158a6