Merge "Merge "Tweak bluetooth name preference" into oc-dr1-dev am: 03c595ce...
Merge "Merge "Tweak bluetooth name preference" into oc-dr1-dev am: 03c595ce am: 3ecdee57" into oc-mr1-dev-plus-aosp
am: b0431ad1
Change-Id: If8ce75c2b5afe786fd23ddcc66d21af188f20391