Merge "Don't crash in addPackageHoldingPermissions()..." into lmp-dev