Merge "cameraserver: Fix package name logged for system uid ndk clients" into main