[automerger skipped] Merge "API Council Feedback - Override EmergencyNumberDB...
[automerger skipped] Merge "API Council Feedback - Override EmergencyNumberDB File API" into rvc-dev am: e171bca3 am: 81c70279 -s ours
am skip reason: Change-Id I7a7733c02874c0f17fef8c91b9e543c8e803f504 with SHA-1 75c49ab3 is in history
Change-Id: If22762740a60202f8b869484326161f5d4f1d2fb