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

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

Change-Id: I4892610d1abf8cc6b8ed2619b008873d941201f8