Merge "Revert "Do not cache wildcard users (PackageManager)""