[automerger skipped] Merge "Integrate MARINE_GUARD service in...

[automerger skipped] Merge "Integrate MARINE_GUARD service in EmergencyNumberTracker from the database" am: 44337ab8 am: 581850c2 -s ours

am skip reason: Merged-In I09529ffe7be19aab01f1aeb5fbaae6f18483a3a6 with SHA-1 545c5294 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1730970

Change-Id: I4d94a67833ff8a7d2615e1e9d4aa8daba367bd92