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 am: f7539d32

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



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