Merge "Protect broadcast emitted by Bluetooth mapmce and pbap profile" am: 7dd909684f
am: 33f0cf1267

Change-Id: I1cb33a340524aeb579330bd49affd02670e89c5a