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

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

Change-Id: I0ea115780146289231a34f11db4821fed052fcb4