Merge "Camera2: Tests: Add CLI arguments for disabling forking and changing camera ID"