Merge "CTS to ensure PM.getPackageInfo() won't return duplicate appinfo" into rvc-dev