Merge "Add APEX UIDs to PackageManager query" into rvc-dev