Merge "Revert "QCamera2: HAL3: Adjust black level metadata per CFA layout""