Merge "Fix crash issue on Storage Manager app"

            }

            if (comparator != null) {

                synchronized (mEntriesMap) {

                    // Locking to ensure that the background handler does not mutate

                    // the size of AppEntries used for ordering while sorting.

                    Collections.sort(filteredApps, comparator);

                }

            }

            synchronized (mRebuildSync) {

                if (!mRebuildRequested) {