Merge "Camera2: Add missing LEGACY available keys" into mnc-dev