Merge "Removed LocationController from PhoneStatusBarPolicy"