Merge "installd: more restrictive uid checks" into main