Merge "Improve app name handling" into tm-qpr-dev am: e4611ad6 am: dc6f3387

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



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