[automerger skipped] Merge "API Council Feedback - Override EmergencyNumberDB...
[automerger skipped] Merge "API Council Feedback - Override EmergencyNumberDB File API" into rvc-dev am: c87b0d6d am: 986ea466 -s ours
am skip reason: Change-Id I774f25a9f6c873c138b30a16dc35553fe9a13966 with SHA-1 c262223b is in history
Change-Id: Ie5e3dbe345160f085085209dab4a44978f91a395