am e0dc40c0: Merge "ANR caused by incorrect cleanup in BroadcastQueue." into lmp-mr1-dev

* commit 'e0dc40c0f232ee2d7c5523f307781ccd3f7cb50b':
  ANR caused by incorrect cleanup in BroadcastQueue.