[automerger skipped] Merge "Add mock modem service operations in Telephony" am: 1a8e82ecb1 -s ours am: e0a53560c4 -s ours

am skip reason: Merged-In Idd34e908ca625a6bf1ba9bd9a115b15315560936 with SHA-1 38340bfb66 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1931604

Change-Id: I694b8118516520bd15cb165a0b1427f91d29d5f8