Merge "Protect various Bluetooth broadcasts" am: 53ff75bb68 am: 779a1f096c
am: 2bad652e56

Change-Id: I342864675beb5083d67c3d74993995936a9af326