Merge "Re-apply Context#getOpPackageName"