Merge "Add requested permissions to the package state hash."

import java.io.FileNotFoundException;

import java.io.IOException;

import java.util.Collections;

import java.util.List;

import java.util.Map;

import java.util.Objects;

import java.util.Set;

                dataOutputStream.writeInt(packageManagerInternal.getApplicationEnabledState(

                        pkg.getPackageName(), userId));

                final List<String> requestedPermissions = pkg.getRequestedPermissions();

                final int requestedPermissionsSize = requestedPermissions.size();

                dataOutputStream.writeInt(requestedPermissionsSize);

                for (int i = 0; i < requestedPermissionsSize; i++) {

                    dataOutputStream.writeUTF(requestedPermissions.get(i));

                }

                final ArraySet<String> enabledComponents =

                        packageManagerInternal.getEnabledComponents(pkg.getPackageName(), userId);

                final int enabledComponentsSize = CollectionUtils.size(enabledComponents);