[automerger skipped] Merge "Cache the country iso in APM, and use it in...
[automerger skipped] Merge "Cache the country iso in APM, and use it in EmergencyNumberTracker" am: 1b1969d8 am: 841739fd -s ours
am skip reason: Change-Id Ia5941ff7d8a92c59b82f606766f9b06830d00c07 with SHA-1 c8372e07 is in history
Change-Id: I2072b395350df7a38958d1395f226e3ef3fabb0d