Merge "bt: Fix persisting appearance for le only device" am: 3eefb7f8 am: 23277fdc am: 5c1ae6dd am: bbf1a03d am: 3ae1bc81 am: 8cd9594d

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



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