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

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

Change-Id: I2c658618b0662578bf8753434549fc74c5dbb666