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

Change-Id: If0b00c67b9f3183669ceca45d23e5a463c283681