Merge "ContentResolver: Always set calling package name"