Merge "Add support for MATCH_APEX in getPackageInfo."