Merge "Include APEX information in PackageManager dumpsys."