[automerger skipped] Merge "Modify methods in PhoneInterfaceManager to integrate  resetOtaEmergencyNumberDbFilePath and updateOtaEmergencyNumberDbFilePath" am: cfb121a560 am: 295d4f21ec -s ours

am skip reason: Change-Id I430b0210d06fcc15f7392f1c373e0a9d3228d301 with SHA-1 c373f118d7 is in history

Change-Id: I856addd83109edaff32153bba216ecaf6bf9123f