Merge "Avoid IOB while bringDownDisabledPackageServicesLocked()"
am: 4e46c416a0

Change-Id: I7b9318bfde747a28cbcc4706a280ca2ee99f37fc