Merge "Protect REFRESH_BATCHED_SCAN broadcast" am: 6eb62f8ee3 am: 9271f57c34 am: 4ceb8fe4b1
am: d202664314

Change-Id: I88f850b6086bbeb9cf71187c995a5dfe9d554595