am 05a419ae: Merge "Temp workaround to track max beacons." into mnc-dev
am 05a419ae: Merge "Temp workaround to track max beacons." into mnc-dev

* commit '05a419aed54da30999a3831d8da6e2e72f85bd40':
  Temp workaround to track max beacons.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base