Merge commit 'e2838c2a1637ca565efc561581d857923137ae3b' * commit 'e2838c2a1637ca565efc561581d857923137ae3b': Moves GoogleLocationSettingManager to its correct location.
Merge commit 'e2838c2a1637ca565efc561581d857923137ae3b' * commit 'e2838c2a1637ca565efc561581d857923137ae3b': Moves GoogleLocationSettingManager to its correct location.