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

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

Change-Id: If8c9925671487d8f93fb259c433db9c580a188d1