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

Change-Id: I979b7fcabc7e1f4714a88a632d3590304e1fb4fb