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