[automerger skipped] Merge "Removed telephony apex" am: 19af8c33b2 am: e2928a3565 -s ours

am skip reason: Merged-In I17b891939b81a76e60845dad193b37e8a7509fc2 with SHA-1 f98fd250b3 is already in history

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

Change-Id: Id5f57586d071f4fa92fd3c273687585aa27a8bf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>