Merge "QCamera2: HAL3: Move AF mode to the same metadata section as AF state" into nyc-mr1-dev