Merge "Camera2: Add metadata keys and enum values" into klp-dev