[automerger skipped] Merge "LocaleTracker: Remove usage of WifiManager.setCountryCode" am: 72a242d0 am: be3e9be4 am: 75dea1d4
am: 34dbe97a -s ours
am skip reason: change_id I5b41baf23e88fa1df37479adf4ac45f50111053a with SHA1 f4bc5676 is in history

Change-Id: Iba1cd9ebf9b03d47d2c17e27498d227693a1c82e