Merge "Add system server pm to trigger CTS PackageManager tests"