Merge "Fix CTS Mixed*OwnerTest#testPackageInstallUserRestrictions." into oc-dev