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: 1d788a0a

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17383907



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