Merge "Extend service permission list only accessible from SystemUid." into main