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

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



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