Merge "android.net.Uri: Move NOT_CACHED constant to holder class."