[automerger skipped] Merge "Export telephonyprovider-assets-carrierlist" am: 367f4ef4de am: ed7e6b7e88 -s ours

am skip reason: Change-Id I4af6cd5023c6fb51812fa7f5ceadcd4805bb2fc1 with SHA-1 dda10a5220 is in history

Change-Id: I3d8417870d63f9c9c17c2d1db13733b217102cb9