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