[automerger skipped] Merge "Add mock modem service operations in Telephony"...

[automerger skipped] Merge "Add mock modem service operations in Telephony" am: a7ab2560 am: 2daf9fed am: f7d27200 am: 328e430b -s ours

am skip reason: Merged-In I65127fc43c62b52e3efaa99d06bf77855aab7bb0 with SHA-1 e000fb4f is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1926901

Change-Id: Ibd223d8979615028cecc07bff078f91c8e213e97