Merge "Camera2: update dynamic black level type"