am e879b2ae: Merge "Prevent ANR when broadcast receiver is killed"

* commit 'e879b2ae69bf7ef159dbdc068423526d5db99df0':
  Prevent ANR when broadcast receiver is killed