am 224904e0: Merge "Prevent ANR when broadcast receiver is killed" into lmp-mr1-dev

* commit '224904e01a2efb01c6276eb64fba531a3d30a42b':
  Prevent ANR when broadcast receiver is killed