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

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

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