[automerger skipped] Merge "Fixed time zone detection not working when SIM is...
[automerger skipped] Merge "Fixed time zone detection not working when SIM is absent" am: 69fcd032 am: 168b46e8
am: 316c2032 -s ours
Change-Id: I5245104fc17fc1f9cb4c4e7d69ceea8de72b714b