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

Change-Id: Id4015a6ff7bfc492181c9e81feadfa66580fbf40