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

Change-Id: I4328a5b9d25f061839856f0758de516ea01ebaf5