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

Change-Id: I773ac5f6a4eacd07b6abe4b19a94735d96a1a605