am bfd125a0: Merge "Fix NPE when public API removeProximityAlert() used before...
am bfd125a0: Merge "Fix NPE when public API removeProximityAlert() used before addProximityAlert()." into jb-dev
* commit 'bfd125a0':
Fix NPE when public API removeProximityAlert() used before addProximityAlert().