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

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