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: I5c3f21963d33a55a1baba6be0dcc985419e68c50