Merge "Don't remove an account we haven't created yet" into main am: 3e97c3b1 am: 0997df7a

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



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