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: f5db132e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17383042



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