tree 575a8ad9fcf373e657c7ebf8613a14a06ae723a6
parent f445bf671699c857968676b72da8eba2ef12301a
parent 1a8e82ecb18412d79d9c832663396b46839f4bdc
author Jim Sun <jimsun@google.com> 1640229992 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1640229992 +0000

[automerger skipped] Merge "Add mock modem service operations in Telephony" am: 1a8e82ecb1 -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: Ib101973a63556d315ea201dcc32e82d7a2c833ad