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

* commit '6465980cd88ea4ed0057bf23867fd3ab8e146dfa':
  Prevent ANR when broadcast receiver is killed