Merge "CameraBokeh:Use correct camera id for test" into android12L-tests-dev