Merge "Don't ANR if a broadcast recipient is sitting at a breakpoint" into pi-dev am: 8ada330da7
am: 146c848d5b

Change-Id: I9e11df0722e043ce2d7c28b8c233a791be6efd03