Merge "Revert "Revert "Convert BT preference to use TwoTargetPreference""" into oc-dev am: fd29aada6b
am: 668dae22e7

Change-Id: Ib618566f6078793be3460070e65bd78b9d0f0a59