[automerger skipped] Adapter test fix: Recreate config after factory reset am:...

[automerger skipped] Adapter test fix: Recreate config after factory reset am: f1476845 -s ours am: 3de94071 -s ours

am skip reason: Merged-In I34f570fa1e18b8674e090c7809e68dab6eafa312 with SHA-1 3ee70109 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/21401134



Change-Id: Idc3e85c58c768865c372f533456696ede3c23f95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>