[automerger skipped] Merge "Cache the emergency number list indication" am:...
[automerger skipped] Merge "Cache the emergency number list indication" am: c3f8f13e am: da07e38d -s ours
am skip reason: Change-Id Ide3713f0d9314e07af7202c22d2360e7f3b346f7 with SHA-1 a888fb8c is in history
Change-Id: I6dff41b4dd89f5e5e1be59d1204c412ec2028566