Merge "Fix a bug where Settings would crash from search into storage."

import android.os.storage.StorageManager;

import android.os.storage.VolumeInfo;

import android.provider.SearchIndexableResource;

import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;

import com.android.internal.logging.nano.MetricsProto;

import com.android.settings.R;

        // Initialize the storage sizes that we can quickly calc.

        StorageManager sm = context.getSystemService(StorageManager.class);

        String volumeId = getArguments().getString(VolumeInfo.EXTRA_VOLUME_ID);

        String volumeId = getArguments().getString(VolumeInfo.EXTRA_VOLUME_ID,

                VolumeInfo.ID_PRIVATE_INTERNAL);

        mVolume = sm.findVolumeById(volumeId);

        if (!isVolumeValid()) {

            getActivity().finish();