Merge "Prevent ANR when broadcast receiver is killed" into lmp-mr1-dev