Merge "Merge "Protect broadcast used in settings for bond cancel" into oc-dev am: 68a4c91bb4 am: 4c342c8a98" into oc-dr1-dev-plus-aosp
am: 61c6f9f204

Change-Id: I883466888853a4914c87ab99ec81795d2af95123