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

Change-Id: I8cae201b4a8b5a294f709e47cd8dbabc03bb0982