[automerger skipped] API Council Feedback - Override EmergencyNumberDB File...

[automerger skipped] API Council Feedback - Override EmergencyNumberDB File API am: a1c74497 am: ba0ef8c9 -s ours am: 4deb3e6c -s ours am: ca49f2e8 -s ours am: 5efc7f6e -s ours

am skip reason: Change-Id I7a7733c02874c0f17fef8c91b9e543c8e803f504 with SHA-1 75c49ab3 is in history

Change-Id: I1bc5d297ffcd9cd7186338930a22d6ce85037891