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