Merge "Add test where trusted old key can continue to update package"