Merge "Changing apk name in the manifest and the corresponding packages." into...

Merge "Changing apk name in the manifest and the corresponding packages." into tm-dev am: 8ea0afb5

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/17263920



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