Merge "Bluetooth string: removed id="sender" in bt_sm_2_1_" am: 4e412c13b3 am: 6f45581931

Change-Id: I8e845a065a05f17d487b7473634f34571600bdfe