[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 -s ours am: 65debb90 -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: I5abefc77ca2b71f4099fb913a24a02246b7a5b66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>