Merge "Use name instead of package name" am: 9b2537195c am: 0b307f3272

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

Change-Id: Iadb7e41739f934a149612d941a1dc6964cc22c27