Merge "Report EditorInfo#packageName based on the actual uid." into mnc-dev