Merge "Some PackageManager Feature Tests" into froyo