[automerger skipped] Merge "API Council Feedback - Override EmergencyNumberDB...

[automerger skipped] Merge "API Council Feedback - Override EmergencyNumberDB File API" into rvc-dev am: e171bca3 am: 6c343fe1 am: bdbf1687 am: 8ea3731e -s ours am: fc9758e5 -s ours
am skip reason: Change-Id I7a7733c02874c0f17fef8c91b9e543c8e803f504 with SHA-1 75c49ab3 is in history

Change-Id: Ib817cf2857e8ab7750aadb6765e431f377a8d9af