Merge "Move Bluetooth off the product="..." strings xml feature" am: 824cdc79af am: ac841b54a8
am: d7a5eb0f72

Change-Id: I3e2ca9eb0909572631729ee33fff99405eec8eef