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

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

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