Merge "Bluetooth sync adr-type "other" between two devices" am: 951d25877c am: d68e116adf am: a4f56d6bf7

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/vcard/+/1888976

Change-Id: I5ed7c70c6859cae85bb179f3adf3b7c2d907b057