Merge "Remove extra text from AndroidManifest.xml" am: d117b2343e am: 23613628ae am: f897bbea46

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

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