Merge "Fix setBluetoothContactSharingDisabled does not persist" into nyc-dev