Merge "Reset persist.bluetooth.factoryreset after config files deleted" am:...

Merge "Reset persist.bluetooth.factoryreset after config files deleted" am: 03c287c2 am: 5c1b3aef am: 8476be9f am: 0afc9869

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



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