Merge "Fix NPE when walking the set of packages to update app link policy" into mnc-dev