[automerger skipped] Merge "Adapter test fix: Recreate config after factory...

[automerger skipped] Merge "Adapter test fix: Recreate config after factory reset" into tm-qpr-dev am: ec7bf15a am: e8cea41f -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: I7573f44db1cc8ac93081ad4dd2dc15d1a1289745
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>