Merge "QCamera2: HAL3: fix CTS testDynamicBlackWhiteLevel" into nyc-dev