Merge "Protect REFRESH_BATCHED_SCAN broadcast"
am: 6eb62f8ee3

Change-Id: I013391d9b75b6a968f5c7c449ce7cac0501448f4