partial fix for cell-tower location bug

Change-Id: I213445c796850e445dee4601335e7dea9f1a32d7
Merge branch 'jb-mr1-release-openpdroid-devel' of https://github.com/OpenPDroid/platform_frameworks_base into jb-mr1-release-openpdroid-devel