[automerger skipped] Merge "API Council Feedback - Override EmergencyNumberDB...
[automerger skipped] Merge "API Council Feedback - Override EmergencyNumberDB File API" am: 3e5e1a76 am: 0bfec8e5 -s ours
am skip reason: Change-Id I774f25a9f6c873c138b30a16dc35553fe9a13966 with SHA-1 c262223b is in history
Change-Id: I0cfee6be483ef9fbba2240491c4f0df217b5932f