Merge "Use Context#getPackageName when retrieving string resource identifier" into sc-dev am: 715cce9b75

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

Change-Id: Idd59d14d1677400390f76ccc4979dee41f874c44