Merge "Camera: Add ACTIVE_PHYSICAL_ID metadata for logical camera"