am 503c5a32: am ea47cb67: (-s ours) am bf6cecc2: am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

* commit '503c5a32a4e718282b88f73e602c09e1bda49aec':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307