Merge "Replace PackageManager @hide APIs"