Merge "Avoid IOB while bringDownDisabledPackageServicesLocked()"