Merge "Properly clean up broadcast-receiver ANR" into oc-mr1-dev
am: 9f9ee61cf6

Change-Id: I07387dbbdf90138d06eaf7c14705946dd4ab2fc5